Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix SQL auto-install. #1252

Merged
merged 3 commits into from
Nov 3, 2016
Merged

Fix SQL auto-install. #1252

merged 3 commits into from
Nov 3, 2016

Conversation

crossan007
Copy link
Contributor

@crossan007 crossan007 commented Nov 1, 2016

closes #1248

To test this:

  • On RC2 Code, Attempt to run ChurchCRM with a username, password, and database in the config file; howevever, ensure that the database does not contain any tables.
    • ChurchCRM is supposed to see that the DB is empty, and it's supposed to install the tables. This fails, and causes a nastygram for the user
  • In this PR, the same actions should successfully install the DB tables without error

@crossan007 crossan007 added this to the 2.3.0 milestone Nov 1, 2016
}
}
else
{
return array("status"=>"failure","message"=>"Signature Definition file signature failed validation");
return array("status"=>"failure","message"=>"Signature Definition File Missing");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use gettext

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. gettext here.

}
else
{
return array("status"=>"failure","message"=>"Signature Definition file signature failed validation");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use gettext

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. gettext here.

}
else
{
array_push($signatureFailures, array("filename"=>$file->filename,"status"=>"File Missing"));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use gettext

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no. This status is used in logic in other places. The user-facing text is already gettext'd in IntegrityCheck.php

$actualHash = sha1_file($CRMInstallRoot."/".$file->filename);
if ( $actualHash != $file->sha1 )
{
array_push($signatureFailures, array("filename"=>$file->filename,"status"=>"Hash Mismatch", "expectedhash"=>$file->sha1,"actualhash"=>$actualHash));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gettext

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no. This status is used in logic in other places. The user-facing text is already gettext'd in IntegrityCheck.php

@crossan007
Copy link
Contributor Author

@DawoudIO take a look now - some of the things you suggested gettext for are not going to work - but I've addressed anything that ends up being displayed to the user.

@crossan007 crossan007 mentioned this pull request Nov 3, 2016
@DawoudIO DawoudIO merged commit 71d9b57 into master Nov 3, 2016
@DawoudIO DawoudIO deleted the 1248-fix-sql-autoinstall branch November 3, 2016 14:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fail to install 2.3.0-RC2
2 participants